Improved drainage strategy